Yet another fix for shape handling

This should fix problems with awn and notify-osd.

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index f7789d4ef48a927a7103fe1f6dead67ef214cf87..1771873218b0888580c951365d089f699a7169ee 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -4610,10 +4610,7 @@ _xwindow_get_shape (Display *xdisplay,
                             window,
                             shape_type, &rn, &ord);
 
-  if (xrl == NULL)
-    return NULL; /* XShape not supported */
-
-  if (rn == 0)
+  if (xrl == NULL || rn == 0)
     return gdk_region_new (); /* Empty */
 
   if (ord != YXBanded)